Oo/builder improvement