Builder now not static