New data model
Elemination of lcoation