Rebuild Data Access layer