Improve message and debt model