Extend generic-x