Issue #40: Move descriptor definition into own interface