Fixed using multiple time units not being parsed correctly
Added support for yrs time unit