Removed dependency on core from builder.