Refactored content type model; tweaked sync copy