Change from YML to annotations