Add base structures for command handling