Refactored params into separate objects; updated specs