Moved datatokens generation into a separate method