Added USD Calendar and code refactoring