Removed currency dependency