Ordered collections before entities
Added description for services