Changes for timelines, fix for federation and internal improvements