added PropertyAnnotation. removed need to pass Grammar into constructor of Terms