Add CLI, change methods and classes to work with user defined parametes