Matt: converting to annotation configuration