Improved support to As keyword