added support for timemap