Update builder and singleton