New format, added support for timing in non-macro