#22 changes on properties and removing rawMessage retrieval