inject command and improving callbacks