Updated parameter handling to be more minimal and flexible