made annotation type messages more generic