Added class to hold parameters in session + refactoring