Refractoring
Initial support for attribute lookups