Fix circular dependency
Add missing require