Enhance DataLayer