Thank god we can get rid of dependency cycle error