Added warp lamp structures