Made into duration parsing more robust