Update annotation module #12
Update public interface to annotations #12