Native command support. Refactoring.