Fixed Generic Builder Support