Additional work on CMSlotEditor