Upgrading command handler to generic.