Use BuildConsumer instead of NormalizedBuildConsumer