Switching to parameters with sensible defaults