uLocate project work - Data layer built