Added better date format support