Fixed annotations, updated utilitymethods