Fixing bad annotations
Adding Callback filter skeleton