added support for key in command callback data