Added the ability to handle aliases and we're now escaping identifiers better.