Separated Params object
Extended Params, added tests.