TypeFiled and TypeVersionField refactored.