Basically just implementing Commands model to library and a little bit refactoring.