Date Conversion added with code refactoring