Fix circular dependancy in services