Added 24-hour format support