Added annotations validation