Added new entities and utilities.