Added option for strict format parsing