moving towards more generic annotations