Adjust databuilder accordingly