Annotation working. Just needed a rearrangement of the code
Modify constructor