Fixing issue where new db model was using old messages table