Added support for internal & external annotations