Added two more time formats