Added kitty exchange handler