Fixed issues with new parameter names