descriptor + related classes added