Add support for timer and path unit types