Improve annotations load
Fix load annotations