Change data layer behaviour