adding types for entity marshalling