Refactor last classes, also pass cli options to all instances
Fix param handling in classes