* Added count to entity option collection, updated demo