Change to use content store