Fixing deprecated annotations