Fixed parameter logic in the create action.

And merged updates made in class.