Moved command definition to singleton class methods