Pending removal of some circular dependencies