Refactor all bindings to use ObjectGenerator