replaced deprecated annotations