More migration to BaseUserContentmodel