Builder code unification, annotation values applied.