Adding home-made-handler and its enum