Moved to annotation configuration