Adding SalesforceObject encapsulation and constants