Moved annotation stuff to separate file