Some timemap improvments