Modifications to support properties and removal of unused classes.