Added function definitions to entity