Refined the parameter-parsing code. Moving towards a universal solution that can be defined in a shared super-class