Added layer support