Optimized the CalEvent, Setting and TimeWindow adapters