Added time_entries, moved tag to tag_id remap into base class