#691 - Add attributes map to EntityForm