Added infrastructure for adding and hooking up commands