added support for builder. again, to go in ogm project