Refactor content types