Command handler update

Closes #325