Ensured consistent use of parameters
Added currency data