Starting to fix content object generator