command-handler support added