Data Layer development undergoing