Rebuilding our emailer model and schema