Removed Factory circular dependancies