Refactored commands and items definition.