Move scope annotations
Add observer method support