Changes some wrapper API, update some messages.