Merge "Add support for aliases and boolean type"