Persistence layer, message conversion among other little things