Add support of Slot