Removed slight circular dependency