Use specific annotated class
Merge pull request #1 from plopesc/7.x-1.x

Use specific annotated class