Fix issue #36
Refactored request model classes into commands