Removed dependency loop