Refactor to change default parameter handling