added descriptor support