New changes to encounter types are here