Refactor how we can pass parameters into scopes