Added support for column aliases to entities
Some more cleanup