Added methods for entity and entity list.