Added initial support for AS in fields set definition
Added initial support for AS in fields set definition