Feature/loaded commands refactor