Moved datatype constants to include and refactored formbuilder accordingly