Improve GenericBuilder implementation