Added support for 'as' option