added location attributes and hibernate mapping