add basic descriptor support