Credential entity Id and entity type Id are now optional in the constructor, added setters