Few updates, incomplete page_collector util, added dependencies