Added more functionality to entity specification