Update annotation spec
change to method call
Refactaring