Removing the base class and adding more support classes
Adding matter association
Adding custom field classes and contact api