More refactor of commands load