Added recuperation of time unit
Added support for variable event