Add convenience builder for EntityAndAttribute
Javadoc tidy up for Entities class