Transition to mapping schemas instead of annotations