removed layers overrided api move all to entity