Add commands
Improve performance