Properly support layered structures.