DataLayer finished in first version