Added new entity variables and methods