Fix build - Schema circular dependency