Added annotations to aid 1.6 development