Brought across refactorings made to Glimpse type in timeline api branch