Adjust message model to try to work with Postgres