Some more renaming of message to campaign
Converted to new Database class