Updated to use Annotations