Add Property, Options, Attribute.
Add aws module.
Clean up imports.