Add some more protocol data
Allow querying for classes