Build fix and consts moved to producer classes