Added an extra abstraction layer after command parsing. Fixes #5.