diff --git a/package.json b/package.json
index 477bbd36..b5cd5f33 100644
--- a/package.json
+++ b/package.json
@@ -160,7 +160,7 @@
     ],
     "globals": {
       "ts-jest": {
-        "tsConfigFile": "/Users/mwoywode/Documents/workspace/KILT/prototype-client/tsconfig.test.json"
+        "tsConfigFile": "tsconfig.test.json"
       }
     }
   },
diff --git a/src/components/AttestedClaimVerificationView/AttestedClaimVerificationView.tsx b/src/components/AttestedClaimVerificationView/AttestedClaimVerificationView.tsx
index 135aa0e2..995da655 100644
--- a/src/components/AttestedClaimVerificationView/AttestedClaimVerificationView.tsx
+++ b/src/components/AttestedClaimVerificationView/AttestedClaimVerificationView.tsx
@@ -4,25 +4,24 @@ import AttestationService from '../../services/AttestationService'
 import * as UiState from '../../state/ducks/UiState'
 import PersistentStore from '../../state/PersistentStore'
 
-import { CType } from '../../types/Ctype'
+import { ICType } from '../../types/Ctype'
 import AttestationStatus from '../AttestationStatus/AttestationStatus'
 import ContactPresentation from '../ContactPresentation/ContactPresentation'
 import CTypePresentation from '../CTypePresentation/CTypePresentation'
 import Spinner from '../Spinner/Spinner'
-
+import { getCtypePropertyTitle } from '../../utils/CtypeUtils'
 import './AttestedClaimVerificationView.scss'
 
 type Props = {
   attestedClaim: sdk.IAttestedClaim
   context?: string
-  cType?: CType
+  cType?: ICType
 }
 
 type State = {}
 
 class AttestedClaimVerificationView extends React.Component<Props, State> {
   private static readonly BLOCK_CHAR: string = '\u2588'
-
   constructor(props: Props) {
     super(props)
     this.state = {}
@@ -88,7 +87,9 @@ class AttestedClaimVerificationView extends React.Component<Props, State> {
     return (
       <div className="attributes">
         {propertyNames.map((propertyName: string) => {
-          const propertyTitle = this.getCtypePropertyTitle(propertyName)
+          const propertyTitle = this.props.cType
+            ? getCtypePropertyTitle(propertyName, this.props.cType)
+            : propertyName
           return (
             <div key={propertyName}>
               <label>{propertyTitle}</label>
@@ -112,11 +113,6 @@ class AttestedClaimVerificationView extends React.Component<Props, State> {
       return contents[propertyName] + ''
     }
   }
-
-  private getCtypePropertyTitle(propertyName: string): string {
-    const { cType } = this.props
-    return cType ? cType.getPropertyTitle(propertyName) : propertyName
-  }
 }
 
 export default AttestedClaimVerificationView
diff --git a/src/components/CTypePresentation/CTypePresentation.tsx b/src/components/CTypePresentation/CTypePresentation.tsx
index d9142280..c0c1b0ad 100644
--- a/src/components/CTypePresentation/CTypePresentation.tsx
+++ b/src/components/CTypePresentation/CTypePresentation.tsx
@@ -13,13 +13,13 @@ import { SubmitLegitimationsProps } from '../../containers/Tasks/SubmitLegitimat
 import CTypeRepository from '../../services/CtypeRepository'
 import * as UiState from '../../state/ducks/UiState'
 import PersistentStore from '../../state/PersistentStore'
-import { ICType } from '../../types/Ctype'
+import { ICTypeWithMetadata } from '../../types/Ctype'
 import SelectAction, { Action } from '../SelectAction/SelectAction'
 
 import './CTypePresentation.scss'
 
 type Props = RouteComponentProps<{}> & {
-  cTypeHash: ICType['cType']['hash']
+  cTypeHash: ICTypeWithMetadata['cType']['hash']
 
   inline?: true
   size?: number
@@ -30,7 +30,7 @@ type Props = RouteComponentProps<{}> & {
 }
 
 type State = {
-  cType?: ICType
+  cType?: ICTypeWithMetadata
 }
 
 const DEFAULT_SIZE = 24
@@ -91,7 +91,7 @@ class CTypePresentation extends React.Component<Props, State> {
               size={size || DEFAULT_SIZE}
               theme="polkadot"
             />
-            {this.getLabel(cType.cType.metadata.title.default)}
+            {this.getLabel(cType.metaData.metadata.title.default)}
           </>
         )}
         {!!actions.length && (
@@ -121,7 +121,7 @@ class CTypePresentation extends React.Component<Props, State> {
   private async setCType() {
     const { cTypeHash } = this.props
 
-    CTypeRepository.findByHash(cTypeHash).then((_cType: ICType) => {
+    CTypeRepository.findByHash(cTypeHash).then((_cType: ICTypeWithMetadata) => {
       this.setState({ cType: _cType })
     })
   }
@@ -188,7 +188,7 @@ class CTypePresentation extends React.Component<Props, State> {
             UiState.Store.updateCurrentTaskAction({
               objective: sdk.MessageBodyType.SUBMIT_LEGITIMATIONS,
               props: {
-                claim: { cTypeHash: cTypeHash },
+                claim: { cTypeHash },
               } as SubmitLegitimationsProps,
             })
           )
diff --git a/src/components/CtypeDetailView/CtypeDetailView.tsx b/src/components/CtypeDetailView/CtypeDetailView.tsx
index d19db787..9a80736e 100644
--- a/src/components/CtypeDetailView/CtypeDetailView.tsx
+++ b/src/components/CtypeDetailView/CtypeDetailView.tsx
@@ -2,7 +2,7 @@ import * as React from 'react'
 import { Link } from 'react-router-dom'
 import CTypeRepository from '../../services/CtypeRepository'
 
-import { ICType } from '../../types/Ctype'
+import { ICType, ICTypeWithMetadata } from '../../types/Ctype'
 import Code from '../Code/Code'
 import ContactPresentation from '../ContactPresentation/ContactPresentation'
 import CTypePresentation from '../CTypePresentation/CTypePresentation'
@@ -14,7 +14,7 @@ type Props = {
 }
 
 type State = {
-  cType?: ICType
+  cType?: ICTypeWithMetadata
 }
 
 class CtypeDetailView extends React.Component<Props, State> {
@@ -25,7 +25,7 @@ class CtypeDetailView extends React.Component<Props, State> {
 
   public componentDidMount() {
     const { cTypeHash } = this.props
-    CTypeRepository.findByHash(cTypeHash).then((_cType: ICType) => {
+    CTypeRepository.findByHash(cTypeHash).then((_cType: ICTypeWithMetadata) => {
       this.setState({ cType: _cType })
     })
   }
@@ -41,13 +41,13 @@ class CtypeDetailView extends React.Component<Props, State> {
             <div className="attributes">
               <div>
                 <label>Title</label>
-                <div>{cType.cType.metadata.title.default}</div>
+                <div>{cType.metaData.metadata.title.default}</div>
               </div>
               <div>
                 <label>Author</label>
                 <div>
                   <ContactPresentation
-                    address={cType.metaData.author}
+                    address={cType.cType.owner!}
                     interactive={true}
                   />
                 </div>
@@ -58,6 +58,12 @@ class CtypeDetailView extends React.Component<Props, State> {
                   <Code>{cType.cType}</Code>
                 </div>
               </div>
+              <div>
+                <label>Metadata</label>
+                <div>
+                  <Code>{cType.metaData.metadata}</Code>
+                </div>
+              </div>
               <CTypePresentation cTypeHash={cTypeHash} size={50} />
             </div>
             <div className="actions">
diff --git a/src/components/CtypeListView/CtypeListView.tsx b/src/components/CtypeListView/CtypeListView.tsx
index c21ca534..24f01732 100644
--- a/src/components/CtypeListView/CtypeListView.tsx
+++ b/src/components/CtypeListView/CtypeListView.tsx
@@ -5,16 +5,16 @@ import { Link, RouteComponentProps, withRouter } from 'react-router-dom'
 import CTypeRepository from '../../services/CtypeRepository'
 import * as CTypes from '../../state/ducks/CTypes'
 import { State as ReduxState } from '../../state/PersistentStore'
-import { ICType } from '../../types/Ctype'
+import { ICTypeWithMetadata } from '../../types/Ctype'
 import ContactPresentation from '../ContactPresentation/ContactPresentation'
 import CTypePresentation from '../CTypePresentation/CTypePresentation'
 
 import './CtypeListView.scss'
 
 type Props = RouteComponentProps<{}> & {
-  onRequestLegitimation: (cType: ICType) => void
+  onRequestLegitimation: (cType: ICTypeWithMetadata) => void
   // mapStateToProps
-  cTypes?: ICType[]
+  cTypes?: ICTypeWithMetadata[]
 }
 
 type State = {
@@ -64,7 +64,7 @@ class CtypeListView extends React.Component<Props, State> {
                       right={true}
                     />
                     <ContactPresentation
-                      address={cType.metaData.author}
+                      address={cType.cType.owner!}
                       interactive={true}
                       right={true}
                     />
@@ -78,7 +78,7 @@ class CtypeListView extends React.Component<Props, State> {
                   </td>
                   <td className="author">
                     <ContactPresentation
-                      address={cType.metaData.author}
+                      address={cType.cType.owner!}
                       interactive={true}
                       right={true}
                     />
diff --git a/src/components/DevTools/DevTools.attestations.tsx b/src/components/DevTools/DevTools.attestations.tsx
index c62737d0..81099714 100644
--- a/src/components/DevTools/DevTools.attestations.tsx
+++ b/src/components/DevTools/DevTools.attestations.tsx
@@ -8,13 +8,14 @@ import * as Attestations from '../../state/ducks/Attestations'
 import { MyDelegation } from '../../state/ducks/Delegations'
 import PersistentStore from '../../state/PersistentStore'
 import { MyIdentity } from '../../types/Contact'
-import { ICType } from '../../types/Ctype'
+import { ICTypeWithMetadata } from '../../types/Ctype'
 import { BsClaim, BsClaimsPool, BsClaimsPoolElement } from './DevTools.claims'
 import { BsCType } from './DevTools.ctypes'
 import { BsDelegation, BsDelegationsPool } from './DevTools.delegations'
 import { BsIdentitiesPool, BsIdentity } from './DevTools.wallet'
 
 import attestationsPool from './data/attestations.json'
+import { IPartialClaim } from '@kiltprotocol/sdk-js'
 
 type UpdateCallback = (bsAttestationKey: keyof BsAttestationsPool) => void
 
@@ -240,9 +241,9 @@ class BsAttestation {
     const { attesterKey } = attest
 
     const attesterIdentity: MyIdentity = await BsIdentity.getByKey(attesterKey)
-    const cType: ICType = await BsCType.getByKey(bsClaim.cTypeKey)
+    const cType: ICTypeWithMetadata = await BsCType.getByKey(bsClaim.cTypeKey)
 
-    const partialClaim = {
+    const partialClaim: IPartialClaim = {
       cTypeHash: cType.cType.hash as string,
       contents: bsClaim.data,
       owner: claimerIdentity.identity.address,
diff --git a/src/components/DevTools/DevTools.ctypes.tsx b/src/components/DevTools/DevTools.ctypes.tsx
index 2a7890d7..a2d08e53 100644
--- a/src/components/DevTools/DevTools.ctypes.tsx
+++ b/src/components/DevTools/DevTools.ctypes.tsx
@@ -3,8 +3,8 @@ import * as sdk from '@kiltprotocol/sdk-js'
 import BlockchainService from '../../services/BlockchainService'
 import CTypeRepository from '../../services/CtypeRepository'
 import errorService from '../../services/ErrorService'
-import { notifySuccess } from '../../services/FeedbackService'
-import { ICType } from '../../types/Ctype'
+import { notifySuccess, notifyError } from '../../services/FeedbackService'
+import { ICTypeWithMetadata } from '../../types/Ctype'
 import { BsIdentity } from './DevTools.wallet'
 
 import cTypesPool from './data/cTypes.json'
@@ -13,6 +13,7 @@ type UpdateCallback = (bsCTypeKey: keyof BsCTypesPool) => void
 
 interface BsCTypesPoolElement extends sdk.ICType {
   owner: string
+  metadata: sdk.ICTypeMetadata['metadata']
 }
 
 type BsCTypesPool = {
@@ -28,17 +29,19 @@ class BsCType {
       .identity
 
     const cType = sdk.CType.fromCType({
-      ...bsCTypeData,
+      schema: bsCTypeData.schema,
+      hash: bsCTypeData.hash,
       owner: ownerIdentity.address,
     })
 
     return cType
       .store(ownerIdentity)
       .then((value: any) => {
-        const cTypeWrapper: ICType = {
+        const cTypeWrapper: ICTypeWithMetadata = {
           cType,
           metaData: {
-            author: ownerIdentity.address,
+            metadata: bsCTypeData.metadata,
+            ctypeHash: cType.hash,
           },
         }
         // TODO: add onrejected when sdk provides error handling
@@ -46,14 +49,14 @@ class BsCType {
       })
       .then(() => {
         notifySuccess(
-          `CTYPE ${cType.metadata.title.default} successfully created.`
+          `CTYPE ${bsCTypeData.metadata.title.default} successfully created.`
         )
       })
       .catch(error => {
         errorService.log({
           error,
           message: 'Could not submit CTYPE',
-          origin: 'CTypeCreate.submit()',
+          origin: 'DevTools.ctypes.tsx.BsCType.save()',
         })
       })
   }
@@ -71,7 +74,9 @@ class BsCType {
     return requests
   }
 
-  public static async getByHash(hash: sdk.ICType['hash']): Promise<ICType> {
+  public static async getByHash(
+    hash: sdk.ICType['hash']
+  ): Promise<ICTypeWithMetadata> {
     const cType = await CTypeRepository.findByHash(hash)
     if (cType) {
       return cType
@@ -79,13 +84,15 @@ class BsCType {
     throw new Error(`Could not find cType with hash '${hash}'`)
   }
 
-  public static async get(bsCType: BsCTypesPoolElement): Promise<ICType> {
+  public static async get(
+    bsCType: BsCTypesPoolElement
+  ): Promise<ICTypeWithMetadata> {
     return BsCType.getByHash(bsCType.hash)
   }
 
   public static async getByKey(
     bsCTypeKey: keyof BsCTypesPool
-  ): Promise<ICType> {
+  ): Promise<ICTypeWithMetadata> {
     const { hash } = BsCType.pool[bsCTypeKey]
     return BsCType.getByHash(hash)
   }
diff --git a/src/components/DevTools/DevTools.delegations.tsx b/src/components/DevTools/DevTools.delegations.tsx
index 64ec5fdd..86930d19 100644
--- a/src/components/DevTools/DevTools.delegations.tsx
+++ b/src/components/DevTools/DevTools.delegations.tsx
@@ -7,7 +7,7 @@ import * as Delegations from '../../state/ducks/Delegations'
 import { DelegationType, MyDelegation } from '../../state/ducks/Delegations'
 import PersistentStore from '../../state/PersistentStore'
 import { MyIdentity } from '../../types/Contact'
-import { ICType } from '../../types/Ctype'
+import { ICTypeWithMetadata } from '../../types/Ctype'
 import { BsCType, BsCTypesPool } from './DevTools.ctypes'
 import { BsIdentitiesPool, BsIdentity } from './DevTools.wallet'
 
@@ -172,7 +172,7 @@ class BsDelegation {
     }
     const ownerIdentity: MyIdentity = await BsIdentity.getByKey(ownerKey)
     await BsIdentity.selectIdentity(ownerIdentity)
-    const cType: ICType = await BsCType.getByKey(cTypeKey)
+    const cType: ICTypeWithMetadata = await BsCType.getByKey(cTypeKey)
 
     if (updateCallback) {
       updateCallback(bsDelegationKey)
diff --git a/src/components/Modal/SelectCTypesModal.tsx b/src/components/Modal/SelectCTypesModal.tsx
index e77870c1..d3843d75 100644
--- a/src/components/Modal/SelectCTypesModal.tsx
+++ b/src/components/Modal/SelectCTypesModal.tsx
@@ -4,7 +4,7 @@ import Select from 'react-select'
 import CTypeRepository from '../../services/CtypeRepository'
 
 import ErrorService from '../../services/ErrorService'
-import { ICType } from '../../types/Ctype'
+import { ICTypeWithMetadata } from '../../types/Ctype'
 import SelectCTypes from '../SelectCTypes/SelectCTypes'
 import Modal, { ModalType } from './Modal'
 
@@ -17,13 +17,13 @@ type Props = {
   showOnInit?: boolean
 
   onCancel?: () => void
-  onConfirm: (selectedCTypes: ICType[]) => void
+  onConfirm: (selectedCTypes: ICTypeWithMetadata[]) => void
 }
 
 type State = {
-  cTypes?: ICType[]
+  cTypes?: ICTypeWithMetadata[]
   isSelectCTypesOpen: boolean
-  selectedCTypes: ICType[]
+  selectedCTypes: ICTypeWithMetadata[]
 }
 
 class SelectCTypesModal extends React.Component<Props, State> {
@@ -85,7 +85,7 @@ class SelectCTypesModal extends React.Component<Props, State> {
       >
         <div>
           <SelectCTypes
-            cTypes={cTypes as ICType[]}
+            cTypes={cTypes as ICTypeWithMetadata[]}
             name={name as string}
             isMulti={isMulti}
             closeMenuOnSelect={closeMenuOnSelect}
@@ -111,7 +111,7 @@ class SelectCTypesModal extends React.Component<Props, State> {
     }
   }
 
-  private onSelectCTypes(selectedCTypes: ICType[]) {
+  private onSelectCTypes(selectedCTypes: ICTypeWithMetadata[]) {
     this.setState({ selectedCTypes })
   }
 
diff --git a/src/components/MyClaimCreateView/MyClaimCreateView.tsx b/src/components/MyClaimCreateView/MyClaimCreateView.tsx
index bb5e07d2..2cd8cd36 100644
--- a/src/components/MyClaimCreateView/MyClaimCreateView.tsx
+++ b/src/components/MyClaimCreateView/MyClaimCreateView.tsx
@@ -11,7 +11,7 @@ import FeedbackService, { notifySuccess } from '../../services/FeedbackService'
 import * as Claims from '../../state/ducks/Claims'
 import * as Wallet from '../../state/ducks/Wallet'
 import { State as ReduxState } from '../../state/PersistentStore'
-import { ICType } from '../../types/Ctype'
+import { ICTypeWithMetadata } from '../../types/Ctype'
 import { BlockUi } from '../../types/UserFeedback'
 import { getClaimInputModel } from '../../utils/CtypeUtils'
 
@@ -30,7 +30,7 @@ type State = {
   partialClaim: sdk.IPartialClaim
   name: string
   isValid: boolean
-  cType?: sdk.CType
+  cType?: ICTypeWithMetadata
 }
 
 class MyClaimCreateView extends Component<Props, State> {
@@ -57,9 +57,8 @@ class MyClaimCreateView extends Component<Props, State> {
     })
 
     CTypeRepository.findByHash(cTypeHash)
-      .then((dbCtype: ICType) => {
-        const cType = sdk.CType.fromCType(dbCtype.cType)
-        this.setState({ cType })
+      .then((dbCtype: ICTypeWithMetadata) => {
+        this.setState({ cType: dbCtype })
         blockUi.remove()
       })
       .catch(error => {
@@ -87,7 +86,10 @@ class MyClaimCreateView extends Component<Props, State> {
               <div>
                 <label>CType</label>
                 <div>
-                  <CTypePresentation cTypeHash={cType.hash} linked={true} />
+                  <CTypePresentation
+                    cTypeHash={cType.cType.hash}
+                    linked={true}
+                  />
                 </div>
               </div>
               <div>
@@ -150,7 +152,7 @@ class MyClaimCreateView extends Component<Props, State> {
 
     if (cType && selectedIdentity) {
       const newClaim: sdk.IClaim = sdk.Claim.fromCTypeAndClaimContents(
-        cType,
+        sdk.CType.fromCType(cType.cType),
         contents || {},
         selectedIdentity.identity.address
       )
diff --git a/src/components/MyClaimListView/MyClaimListView.tsx b/src/components/MyClaimListView/MyClaimListView.tsx
index cd24cdef..9208692f 100644
--- a/src/components/MyClaimListView/MyClaimListView.tsx
+++ b/src/components/MyClaimListView/MyClaimListView.tsx
@@ -3,7 +3,7 @@ import * as React from 'react'
 import { Link } from 'react-router-dom'
 
 import * as Claims from '../../state/ducks/Claims'
-import { ICType } from '../../types/Ctype'
+import { ICTypeWithMetadata } from '../../types/Ctype'
 import CTypePresentation from '../CTypePresentation/CTypePresentation'
 import SelectCTypesModal from '../Modal/SelectCTypesModal'
 import SelectAction from '../SelectAction/SelectAction'
@@ -13,7 +13,7 @@ import './MyClaimListView.scss'
 type Props = {
   claimStore: Claims.Entry[]
 
-  onCreateClaimFromCType: (selectedCTypes: ICType[]) => void
+  onCreateClaimFromCType: (selectedCTypes: ICTypeWithMetadata[]) => void
   onRemoveClaim: (claimEntry: Claims.Entry) => void
   onRequestAttestation: (claimEntry: Claims.Entry) => void
   onRequestLegitimation: (claimEntry: Claims.Entry) => void
@@ -134,7 +134,7 @@ class MyClaimListView extends React.Component<Props, State> {
     }
   }
 
-  private createClaimFromCType(selectedCTypes: ICType[]) {
+  private createClaimFromCType(selectedCTypes: ICTypeWithMetadata[]) {
     const { onCreateClaimFromCType } = this.props
     onCreateClaimFromCType(selectedCTypes)
   }
diff --git a/src/components/SelectAttestedClaim/SelectAttestedClaim.tsx b/src/components/SelectAttestedClaim/SelectAttestedClaim.tsx
index 236e509b..501ab3d1 100644
--- a/src/components/SelectAttestedClaim/SelectAttestedClaim.tsx
+++ b/src/components/SelectAttestedClaim/SelectAttestedClaim.tsx
@@ -8,12 +8,13 @@ import isEqual from 'lodash/isEqual'
 import CTypeRepository from '../../services/CtypeRepository'
 import * as Claims from '../../state/ducks/Claims'
 import { State as ReduxState } from '../../state/PersistentStore'
-import { CType, ICType } from '../../types/Ctype'
+import { ICType, ICTypeWithMetadata } from '../../types/Ctype'
 import AttestationStatus from '../AttestationStatus/AttestationStatus'
 import ContactPresentation from '../ContactPresentation/ContactPresentation'
 import { SelectAttestedClaimsLabels } from '../SelectAttestedClaims/SelectAttestedClaims'
 
 import './SelectAttestedClaim.scss'
+import { getCtypePropertyTitle } from '../../utils/CtypeUtils'
 
 type Props = {
   claimEntry: Claims.Entry
@@ -25,7 +26,7 @@ type Props = {
 export type State = {
   allAttestedClaimsSelected?: boolean
   allClaimPropertiesSelected?: boolean
-  cType?: CType
+  cType?: ICType
   isSelected: boolean
   selectedAttestedClaims: sdk.IAttestedClaim[]
   selectedClaimProperties: string[]
@@ -47,9 +48,16 @@ class SelectAttestedClaim extends React.Component<Props, State> {
   public componentDidMount() {
     const { cTypeHash } = this.props
     if (cTypeHash) {
-      CTypeRepository.findByHash(cTypeHash).then((cType: ICType) => {
-        this.setState({ cType: CType.fromObject(cType) })
-      })
+      CTypeRepository.findByHash(cTypeHash).then(
+        (cType: ICTypeWithMetadata) => {
+          const cTypeReference: ICType = {
+            cType: cType.cType,
+            metadata: cType.metaData.metadata,
+            ctypeHash: cType.cType.hash,
+          }
+          this.setState({ cType: cTypeReference })
+        }
+      )
     }
   }
 
@@ -126,7 +134,9 @@ class SelectAttestedClaim extends React.Component<Props, State> {
             </label>
           </h4>
           {propertyNames.map((propertyName: string) => {
-            const propertyTitle = this.getCtypePropertyTitle(propertyName)
+            const propertyTitle = this.state.cType
+              ? getCtypePropertyTitle(propertyName, this.state.cType)
+              : propertyName
             return (
               <label
                 key={propertyName}
@@ -146,11 +156,6 @@ class SelectAttestedClaim extends React.Component<Props, State> {
     )
   }
 
-  private getCtypePropertyTitle(propertyName: string): string {
-    const { cType } = this.state
-    return cType ? cType.getPropertyTitle(propertyName) : propertyName
-  }
-
   private selectClaimProperty(
     propertyName: string,
     event: ChangeEvent<HTMLInputElement>
diff --git a/src/components/SelectCTypes/SelectCTypes.tsx b/src/components/SelectCTypes/SelectCTypes.tsx
index d728e0d4..1c3c85cd 100644
--- a/src/components/SelectCTypes/SelectCTypes.tsx
+++ b/src/components/SelectCTypes/SelectCTypes.tsx
@@ -5,7 +5,7 @@ import { Config } from 'react-select/lib/filters'
 import CTypeRepository from '../../services/CtypeRepository'
 import ErrorService from '../../services/ErrorService'
 
-import { ICType } from '../../types/Ctype'
+import { ICType, ICTypeWithMetadata } from '../../types/Ctype'
 import CTypePresentation from '../CTypePresentation/CTypePresentation'
 
 type SelectOption = {
@@ -16,19 +16,19 @@ type SelectOption = {
 
 type Props = {
   closeMenuOnSelect?: boolean
-  cTypes?: ICType[]
+  cTypes?: ICTypeWithMetadata[]
   isMulti?: boolean
   name?: string
   placeholder?: string
   preSelectedCTypeHashes?: Array<ICType['cType']['hash'] | undefined>
 
-  onChange?: (selectedCTypes: ICType[]) => void
+  onChange?: (selectedCTypes: ICTypeWithMetadata[]) => void
   onMenuOpen?: () => void
   onMenuClose?: () => void
 }
 
 type State = {
-  cTypes: ICType[]
+  cTypes: ICTypeWithMetadata[]
 }
 
 class SelectCTypes extends React.Component<Props, State> {
@@ -60,7 +60,7 @@ class SelectCTypes extends React.Component<Props, State> {
 
     if (!cTypes.length) {
       CTypeRepository.findAll()
-        .then((fetchedCTypes: ICType[]) => {
+        .then((fetchedCTypes: ICTypeWithMetadata[]) => {
           this.setState({ cTypes: fetchedCTypes })
           this.initPreSelection()
         })
@@ -93,7 +93,7 @@ class SelectCTypes extends React.Component<Props, State> {
     )
 
     const options: SelectOption[] = cTypes.map(
-      (cType: ICType): SelectOption => this.getOption(cType)
+      (cType: ICTypeWithMetadata): SelectOption => this.getOption(cType)
     )
 
     const defaultOptions = options.filter(
@@ -123,11 +123,11 @@ class SelectCTypes extends React.Component<Props, State> {
     )
   }
 
-  private getOption(cType: ICType): SelectOption {
+  private getOption(cType: ICTypeWithMetadata): SelectOption {
     return {
       baseValue: `${cType.cType.hash}`,
       label: <CTypePresentation cTypeHash={cType.cType.hash} />,
-      value: `${cType.cType.metadata.title.default} ${cType.cType.hash}`,
+      value: `${cType.metaData.metadata.title.default} ${cType.cType.hash}`,
     }
   }
 
@@ -143,8 +143,9 @@ class SelectCTypes extends React.Component<Props, State> {
       : [selectedOptions]
     ).map((selectedOption: SelectOption) => selectedOption.baseValue)
 
-    const selectedCTypes: ICType[] = cTypes.filter(
-      (cType: ICType) => _selectedOptions.indexOf(`${cType.cType.hash}`) !== -1
+    const selectedCTypes: ICTypeWithMetadata[] = cTypes.filter(
+      (cType: ICTypeWithMetadata) =>
+        _selectedOptions.indexOf(`${cType.cType.hash}`) !== -1
     )
 
     if (onChange) {
@@ -159,7 +160,7 @@ class SelectCTypes extends React.Component<Props, State> {
     if (preSelectedCTypeHashes && preSelectedCTypeHashes.length && onChange) {
       onChange(
         cTypes.filter(
-          (cType: ICType) =>
+          (cType: ICTypeWithMetadata) =>
             preSelectedCTypeHashes.indexOf(cType.cType.hash) !== -1
         )
       )
diff --git a/src/components/SelectClaims/SelectClaims.tsx b/src/components/SelectClaims/SelectClaims.tsx
index a02f6023..e3f2e286 100644
--- a/src/components/SelectClaims/SelectClaims.tsx
+++ b/src/components/SelectClaims/SelectClaims.tsx
@@ -8,7 +8,7 @@ import { Config } from 'react-select/lib/filters'
 import * as Claims from '../../state/ducks/Claims'
 import * as UiState from '../../state/ducks/UiState'
 import PersistentStore from '../../state/PersistentStore'
-import { ICType } from '../../types/Ctype'
+import { ICType, ICTypeWithMetadata } from '../../types/Ctype'
 import SelectCTypesModal from '../Modal/SelectCTypesModal'
 
 type SelectOption = {
@@ -178,7 +178,7 @@ class SelectClaims extends React.Component<Props, State> {
     }
   }
 
-  private onSelectCType(selectedCtypes: ICType[]) {
+  private onSelectCType(selectedCtypes: ICTypeWithMetadata[]) {
     this.goToClaimCreate(selectedCtypes[0].cType.hash)
   }
 
diff --git a/src/containers/ClaimCreate/ClaimCreate.tsx b/src/containers/ClaimCreate/ClaimCreate.tsx
index ad2c6f01..f04714f1 100644
--- a/src/containers/ClaimCreate/ClaimCreate.tsx
+++ b/src/containers/ClaimCreate/ClaimCreate.tsx
@@ -24,7 +24,7 @@ class ClaimCreate extends Component<Props, State> {
     return (
       cTypeHash && (
         <MyClaimCreateView
-          partialClaim={{ cTypeHash: cTypeHash }}
+          partialClaim={{ cTypeHash }}
           onCreate={this.claimCreated}
           onCancel={this.handleCancel}
         />
diff --git a/src/containers/ClaimView/ClaimView.tsx b/src/containers/ClaimView/ClaimView.tsx
index 2728da91..286587ce 100644
--- a/src/containers/ClaimView/ClaimView.tsx
+++ b/src/containers/ClaimView/ClaimView.tsx
@@ -17,7 +17,7 @@ import { State as ReduxState } from '../../state/PersistentStore'
 import { Contact, MyIdentity } from '../../types/Contact'
 
 import './ClaimView.scss'
-import { ICType } from '../../types/Ctype'
+import { ICTypeWithMetadata } from '../../types/Ctype'
 import { RequestAttestationProps } from '../Tasks/RequestAttestation/RequestAttestation'
 import { RequestLegitimationsProps } from '../Tasks/RequestLegitimation/RequestLegitimation'
 
@@ -210,7 +210,7 @@ class ClaimView extends React.Component<Props, State> {
     }
   }
 
-  private createClaimFromCType(selectedCTypes: ICType[]) {
+  private createClaimFromCType(selectedCTypes: ICTypeWithMetadata[]) {
     this.props.history.push(`/claim/new/${selectedCTypes[0].cType.hash}`)
   }
 }
diff --git a/src/containers/CtypeCreate/CtypeCreate.tsx b/src/containers/CtypeCreate/CtypeCreate.tsx
index 1bacece8..c8a9fd1d 100644
--- a/src/containers/CtypeCreate/CtypeCreate.tsx
+++ b/src/containers/CtypeCreate/CtypeCreate.tsx
@@ -11,7 +11,7 @@ import FeedbackService, {
 } from '../../services/FeedbackService'
 import * as Wallet from '../../state/ducks/Wallet'
 import { State as ReduxState } from '../../state/PersistentStore'
-import { ICType } from '../../types/Ctype'
+import { ICTypeWithMetadata } from '../../types/Ctype'
 import { BlockUi } from '../../types/UserFeedback'
 import './CtypeCreate.scss'
 import { fromInputModel } from '../../utils/CtypeUtils'
@@ -61,9 +61,13 @@ class CTypeCreate extends React.Component<Props, State> {
     ) {
       const { selectedIdentity, history } = this.props
       let cType: sdk.CType
-
+      let metadata: sdk.ICTypeMetadata
       try {
-        cType = fromInputModel(this.state.cType, selectedIdentity.identity.address)
+        const inputICTypeWithMetadata: ICTypeWithMetadata = fromInputModel(
+          this.state.cType
+        )
+        cType = sdk.CType.fromCType(inputICTypeWithMetadata.cType)
+        metadata = inputICTypeWithMetadata.metaData
       } catch (error) {
         errorService.log({
           error,
@@ -72,44 +76,52 @@ class CTypeCreate extends React.Component<Props, State> {
         })
         return
       }
-
       const blockUi: BlockUi = FeedbackService.addBlockUi({
         headline: 'Creating CTYPE',
       })
-
+      const cTypeWrapper: ICTypeWithMetadata = {
+        cType: {
+          schema: cType.schema,
+          owner: selectedIdentity.identity.address,
+          hash: cType.hash,
+        },
+        metaData: metadata,
+      }
       cType
         .store(selectedIdentity.identity)
-        .then(({ payload }) => {
+        .then((value: any) => {
           blockUi.updateMessage(
             `CTYPE stored on blockchain,\nnow registering CTYPE`
-          )
-          const cTypeWrapper: ICType = {
-            cType: payload,
-            metaData: {
-              author: selectedIdentity.identity.address,
-            },
-          }
-
-          console.log(cTypeWrapper)
-
-          // TODO: add onrejected when sdk provides error handling
-          CTypeRepository.register(cTypeWrapper).then(() => {
-            blockUi.remove()
-            notifySuccess(
-              `CTYPE ${cType.metadata.title.default} successfully created.`
-            )
-            history.push('/cType')
-          })
+          ) // TODO: add onrejected when sdk provides error handling
         })
         .catch(error => {
           errorService.log({
             error,
-            message: 'Could not submit CTYPE',
-            origin: 'CTypeCreate.submit()',
+            message: 'Could not submit CTYPE to the Blockchain',
+            origin: 'CType.store()',
           })
           notifyError(error)
           blockUi.remove()
         })
+        .then(() => {
+          return CTypeRepository.register(cTypeWrapper)
+            .then(() => {
+              blockUi.remove()
+              notifySuccess(
+                `CTYPE ${metadata.metadata.title.default} successfully created.`
+              ) // something better?
+              history.push('/cType')
+            })
+            .catch(error => {
+              errorService.log({
+                error,
+                message: 'Could not submit CTYPE to the Registry',
+                origin: 'CTypeRepository.register()',
+              })
+              notifyError(error)
+              blockUi.remove()
+            })
+        })
     }
   }
 
diff --git a/src/containers/CtypeView/CtypeView.tsx b/src/containers/CtypeView/CtypeView.tsx
index f3bf92a6..1f9f818f 100644
--- a/src/containers/CtypeView/CtypeView.tsx
+++ b/src/containers/CtypeView/CtypeView.tsx
@@ -8,7 +8,7 @@ import attestationWorkflow from '../../services/AttestationWorkflow'
 import CTypeRepository from '../../services/CtypeRepository'
 import errorService from '../../services/ErrorService'
 import { Contact } from '../../types/Contact'
-import { ICType } from '../../types/Ctype'
+import { ICTypeWithMetadata } from '../../types/Ctype'
 
 import './CtypeView.scss'
 
@@ -18,7 +18,7 @@ type State = {}
 
 class CtypeView extends React.Component<Props, State> {
   private selectAttestersModal: SelectContactsModal | null
-  private cTypeToLegitimate: ICType
+  private cTypeToLegitimate: ICTypeWithMetadata
 
   constructor(props: Props) {
     super(props)
@@ -50,7 +50,7 @@ class CtypeView extends React.Component<Props, State> {
     )
   }
 
-  private requestLegitimation(cType: ICType) {
+  private requestLegitimation(cType: ICTypeWithMetadata) {
     if (cType && this.selectAttestersModal) {
       this.cTypeToLegitimate = cType
       this.selectAttestersModal.show()
diff --git a/src/containers/DelegationsView/DelegationsView.tsx b/src/containers/DelegationsView/DelegationsView.tsx
index 59680296..5d8158af 100644
--- a/src/containers/DelegationsView/DelegationsView.tsx
+++ b/src/containers/DelegationsView/DelegationsView.tsx
@@ -15,7 +15,7 @@ import { MyDelegation } from '../../state/ducks/Delegations'
 import * as Wallet from '../../state/ducks/Wallet'
 import { State as ReduxState } from '../../state/PersistentStore'
 import { Contact, MyIdentity } from '../../types/Contact'
-import { ICType } from '../../types/Ctype'
+import { ICTypeWithMetadata } from '../../types/Ctype'
 
 import './DelegationsView.scss'
 
@@ -170,7 +170,7 @@ class DelegationsView extends React.Component<Props, State> {
     }
   }
 
-  private onSelectCType(selectedCTypes: ICType[]) {
+  private onSelectCType(selectedCTypes: ICTypeWithMetadata[]) {
     if (selectedCTypes && selectedCTypes.length === 1) {
       const { isPCR } = this.props
       this.props.history.push(
diff --git a/src/containers/Tasks/RequestLegitimation/RequestLegitimation.tsx b/src/containers/Tasks/RequestLegitimation/RequestLegitimation.tsx
index 6a49956d..c2bdf5a5 100644
--- a/src/containers/Tasks/RequestLegitimation/RequestLegitimation.tsx
+++ b/src/containers/Tasks/RequestLegitimation/RequestLegitimation.tsx
@@ -69,9 +69,7 @@ class RequestLegitimation extends React.Component<
   private handleSubmit() {
     const { cTypeHash, receiverAddresses, onFinished } = this.props
     const { selectedClaimEntries } = this.state
-    let claims: sdk.IPartialClaim[] = [
-      { cTypeHash: cTypeHash } as sdk.IPartialClaim,
-    ]
+    let claims: sdk.IPartialClaim[] = [{ cTypeHash } as sdk.IPartialClaim]
 
     if (selectedClaimEntries && selectedClaimEntries.length) {
       claims = selectedClaimEntries.map(
diff --git a/src/containers/Tasks/SubmitLegitimations/SubmitLegitimations.tsx b/src/containers/Tasks/SubmitLegitimations/SubmitLegitimations.tsx
index 0c987888..b7471606 100644
--- a/src/containers/Tasks/SubmitLegitimations/SubmitLegitimations.tsx
+++ b/src/containers/Tasks/SubmitLegitimations/SubmitLegitimations.tsx
@@ -12,7 +12,7 @@ import AttestationWorkflow from '../../../services/AttestationWorkflow'
 import CTypeRepository from '../../../services/CtypeRepository'
 import { MyDelegation } from '../../../state/ducks/Delegations'
 import { Contact } from '../../../types/Contact'
-import { ICType } from '../../../types/Ctype'
+import { ICTypeWithMetadata } from '../../../types/Ctype'
 import { getClaimInputModel } from '../../../utils/CtypeUtils'
 
 import './SubmitLegitimations.scss'
@@ -31,7 +31,7 @@ type Props = InjectedSelectProps & SubmitLegitimationsProps
 
 type State = {
   claim: sdk.IPartialClaim
-  cType?: sdk.CType
+  cType?: ICTypeWithMetadata
   selectedDelegation?: MyDelegation
   withPreFilledClaim?: boolean
 }
@@ -53,11 +53,13 @@ class SubmitLegitimations extends React.Component<Props, State> {
   public componentDidMount() {
     const { claim } = this.state
 
-    CTypeRepository.findByHash(claim.cTypeHash).then((cType: ICType) => {
-      this.setState({
-        cType: sdk.CType.fromCType(cType.cType),
-      })
-    })
+    CTypeRepository.findByHash(claim.cTypeHash).then(
+      (cType: ICTypeWithMetadata) => {
+        this.setState({
+          cType,
+        })
+      }
+    )
   }
 
   public render() {
diff --git a/src/containers/Tasks/Tasks.tsx b/src/containers/Tasks/Tasks.tsx
index de41a685..d1408825 100644
--- a/src/containers/Tasks/Tasks.tsx
+++ b/src/containers/Tasks/Tasks.tsx
@@ -9,7 +9,7 @@ import SelectCTypes from '../../components/SelectCTypes/SelectCTypes'
 import * as UiState from '../../state/ducks/UiState'
 import { State as ReduxState } from '../../state/PersistentStore'
 import { Contact } from '../../types/Contact'
-import { ICType } from '../../types/Ctype'
+import { ICType, ICTypeWithMetadata } from '../../types/Ctype'
 import RequestAcceptDelegation, {
   RequestAcceptDelegationProps,
 } from './RequestAcceptDelegation/RequestAcceptDelegation'
@@ -71,7 +71,7 @@ type Props = {
 type State = {
   openMenus: number
   selectedReceivers: Contact[]
-  selectedCTypes: ICType[]
+  selectedCTypes: ICTypeWithMetadata[]
 }
 
 const initialState: State = {
@@ -198,7 +198,7 @@ class Tasks extends React.Component<Props, State> {
             {!!selectedCTypes.length && !!selectedReceivers.length ? (
               <RequestClaimsForCType
                 cTypeHashes={selectedCTypes.map(
-                  (cType: ICType) => cType.cType.hash
+                  (cType: ICTypeWithMetadata) => cType.cType.hash
                 )}
                 receiverAddresses={selectedReceiverAddresses}
                 onFinished={this.onTaskFinished}
@@ -221,7 +221,7 @@ class Tasks extends React.Component<Props, State> {
             {!!selectedCTypes.length && !!selectedReceivers.length ? (
               <SubmitClaimsForCType
                 cTypeHashes={selectedCTypes.map(
-                  (cType: ICType) => cType.cType.hash
+                  (cType: ICTypeWithMetadata) => cType.cType.hash
                 )}
                 receiverAddresses={selectedReceiverAddresses}
                 onFinished={this.onTaskFinished}
@@ -359,7 +359,7 @@ class Tasks extends React.Component<Props, State> {
     )
   }
 
-  private onSelectCTypes(selectedCTypes: ICType[]) {
+  private onSelectCTypes(selectedCTypes: ICTypeWithMetadata[]) {
     this.setState({ selectedCTypes })
   }
 
diff --git a/src/services/CtypeRepository.ts b/src/services/CtypeRepository.ts
index 4dc80100..c643d0e0 100644
--- a/src/services/CtypeRepository.ts
+++ b/src/services/CtypeRepository.ts
@@ -2,7 +2,7 @@ import * as sdk from '@kiltprotocol/sdk-js'
 
 import * as CTypes from '../state/ducks/CTypes'
 import PersistentStore from '../state/PersistentStore'
-import { ICType } from '../types/Ctype'
+import { ICTypeWithMetadata } from '../types/Ctype'
 
 import { BasePostParams } from './BaseRepository'
 
@@ -12,7 +12,7 @@ import { BasePostParams } from './BaseRepository'
 class CTypeRepository {
   public static async findByHash(
     hash: sdk.ICType['hash']
-  ): Promise<void | ICType> {
+  ): Promise<void | ICTypeWithMetadata> {
     const storedCType = CTypes.getCType(PersistentStore.store.getState(), hash)
 
     if (storedCType) {
@@ -27,7 +27,7 @@ class CTypeRepository {
         return response
       })
       .then(response => response.json())
-      .then((cType: ICType) => {
+      .then((cType: ICTypeWithMetadata) => {
         PersistentStore.store.dispatch(CTypes.Store.addCType(cType))
         return cType
       })
@@ -36,16 +36,16 @@ class CTypeRepository {
       })
   }
 
-  public static async findAll(): Promise<ICType[]> {
+  public static async findAll(): Promise<ICTypeWithMetadata[]> {
     return fetch(`${CTypeRepository.URL}`)
       .then(response => response.json())
-      .then((cTypes: ICType[]) => {
+      .then((cTypes: ICTypeWithMetadata[]) => {
         PersistentStore.store.dispatch(CTypes.Store.addCTypes(cTypes))
         return CTypes.getCTypes(PersistentStore.store.getState())
       })
   }
 
-  public static async register(cType: ICType): Promise<Response> {
+  public static async register(cType: ICTypeWithMetadata): Promise<Response> {
     return fetch(CTypeRepository.URL, {
       ...BasePostParams,
       body: JSON.stringify(cType),
diff --git a/src/services/DidService.ts b/src/services/DidService.ts
index e820b13d..1bd18288 100644
--- a/src/services/DidService.ts
+++ b/src/services/DidService.ts
@@ -23,7 +23,7 @@ export class DidService {
       ContactRepository.URL
     }/${myIdentity.identity.address}`
     const did = sdk.Did.fromIdentity(myIdentity.identity, documentStore)
-    const didDocument = did.getDefaultDocument(`${MessageRepository.URL}`)
+    const didDocument = did.createDefaultDidDocument(`${MessageRepository.URL}`)
     const hash = sdk.Crypto.hashStr(JSON.stringify(didDocument))
     const signature = myIdentity.identity.signStr(hash)
     await ContactRepository.add({
diff --git a/src/services/MessageRepository.tsx b/src/services/MessageRepository.tsx
index 3c83a033..4009774f 100644
--- a/src/services/MessageRepository.tsx
+++ b/src/services/MessageRepository.tsx
@@ -233,13 +233,18 @@ class MessageRepository {
       case sdk.MessageBodyType.REQUEST_LEGITIMATIONS:
         return [(message.body as sdk.IRequestLegitimations).content.cTypeHash]
       case sdk.MessageBodyType.SUBMIT_LEGITIMATIONS:
-        return [(message.body as sdk.ISubmitLegitimations).content.claim.cTypeHash]
+        return [
+          (message.body as sdk.ISubmitLegitimations).content.claim.cTypeHash,
+        ]
       case sdk.MessageBodyType.REJECT_LEGITIMATIONS:
-        return [(message.body as sdk.IRejectLegitimations).content.claim.cTypeHash]
+        return [
+          (message.body as sdk.IRejectLegitimations).content.claim.cTypeHash,
+        ]
 
       case sdk.MessageBodyType.REQUEST_ATTESTATION_FOR_CLAIM:
         return [
-          (message.body as sdk.IRequestAttestationForClaim).content.claim.cTypeHash,
+          (message.body as sdk.IRequestAttestationForClaim).content.claim
+            .cTypeHash,
         ]
       case sdk.MessageBodyType.SUBMIT_ATTESTATION_FOR_CLAIM:
         return [
@@ -248,7 +253,8 @@ class MessageRepository {
         ]
       case sdk.MessageBodyType.REJECT_ATTESTATION_FOR_CLAIM:
         return [
-          (message.body as sdk.IRejectAttestationForClaim).content.claim.cTypeHash,
+          (message.body as sdk.IRejectAttestationForClaim).content.claim
+            .cTypeHash,
         ]
 
       case sdk.MessageBodyType.REQUEST_CLAIMS_FOR_CTYPES:
@@ -257,7 +263,8 @@ class MessageRepository {
         const cTypeHashes: Array<
           ICType['cType']['hash']
         > = (message.body as sdk.ISubmitClaimsForCTypes).content.map(
-          (attestedClaim: IAttestedClaim) => attestedClaim.request.claim.cTypeHash
+          (attestedClaim: IAttestedClaim) =>
+            attestedClaim.request.claim.cTypeHash
         )
         const uniqueCTypeHashes: Array<
           ICType['cType']['hash']
@@ -268,11 +275,13 @@ class MessageRepository {
         return uniqueCTypeHashes
       case sdk.MessageBodyType.ACCEPT_CLAIMS_FOR_CTYPES:
         return [
-          (message.body as sdk.IAcceptClaimsForCTypes).content[0].request.rootHash,
+          (message.body as sdk.IAcceptClaimsForCTypes).content[0].request
+            .rootHash,
         ]
       case sdk.MessageBodyType.REJECT_CLAIMS_FOR_CTYPES:
         return [
-          (message.body as sdk.IRejectClaimsForCTypes).content[0].request.rootHash,
+          (message.body as sdk.IRejectClaimsForCTypes).content[0].request
+            .rootHash,
         ]
 
       case sdk.MessageBodyType.REQUEST_ACCEPT_DELEGATION:
diff --git a/src/state/ducks/CTypes.ts b/src/state/ducks/CTypes.ts
index 83fe6588..e93343e6 100644
--- a/src/state/ducks/CTypes.ts
+++ b/src/state/ducks/CTypes.ts
@@ -2,22 +2,22 @@ import Immutable from 'immutable'
 import { createSelector } from 'reselect'
 
 import KiltAction from '../../types/Action'
-import { ICType } from '../../types/Ctype'
+import { ICType, ICTypeWithMetadata } from '../../types/Ctype'
 import PersistentStore from '../PersistentStore'
 import { State as ReduxState } from '../PersistentStore'
 
 interface AddCTypeAction extends KiltAction {
-  payload: ICType
+  payload: ICTypeWithMetadata
 }
 
 interface AddCTypesAction extends KiltAction {
-  payload: ICType[]
+  payload: ICTypeWithMetadata[]
 }
 
 type Action = AddCTypeAction | AddCTypesAction
 
 type State = {
-  cTypes: Immutable.Map<ICType['cType']['hash'], ICType>
+  cTypes: Immutable.Map<ICType['cType']['hash'], ICTypeWithMetadata>
 }
 
 type ImmutableState = Immutable.Record<State>
@@ -43,14 +43,14 @@ class Store {
     }
   }
 
-  public static addCType(cType: ICType): AddCTypeAction {
+  public static addCType(cType: ICTypeWithMetadata): AddCTypeAction {
     return {
       payload: cType,
       type: Store.ACTIONS.ADD_CTYPE,
     }
   }
 
-  public static addCTypes(cTypes: ICType[]): AddCTypesAction {
+  public static addCTypes(cTypes: ICTypeWithMetadata[]): AddCTypesAction {
     return {
       payload: cTypes,
       type: Store.ACTIONS.ADD_CTYPES,
@@ -59,7 +59,7 @@ class Store {
 
   public static createState(obj?: State): ImmutableState {
     return Immutable.Record({
-      cTypes: Immutable.Map<ICType['cType']['hash'], ICType>(),
+      cTypes: Immutable.Map<ICType['cType']['hash'], ICTypeWithMetadata>(),
     } as State)(obj)
   }
 
@@ -70,10 +70,10 @@ class Store {
 }
 
 const arrayToMap = (
-  cTypeArray: ICType[]
-): Immutable.Map<ICType['cType']['hash'], ICType> => {
-  const cTypes: { [hash: string]: ICType } = {}
-  cTypeArray.forEach((cType: ICType) => {
+  cTypeArray: ICTypeWithMetadata[]
+): Immutable.Map<ICType['cType']['hash'], ICTypeWithMetadata> => {
+  const cTypes: { [hash: string]: ICTypeWithMetadata } = {}
+  cTypeArray.forEach((cType: ICTypeWithMetadata) => {
     const { hash } = cType.cType
     if (hash) {
       cTypes[hash] = cType
@@ -91,7 +91,7 @@ const _getCTypes = (state: ReduxState) => {
 
 const getCTypes = createSelector(
   [_getCTypes],
-  (cTypes: ICType[]) => cTypes
+  (cTypes: ICTypeWithMetadata[]) => cTypes
 )
 
 const _getCType = (state: ReduxState, address: ICType['cType']['hash']) =>
@@ -99,7 +99,7 @@ const _getCType = (state: ReduxState, address: ICType['cType']['hash']) =>
 
 const getCType = createSelector(
   [_getCType],
-  (cType: ICType) => cType
+  (cType: ICTypeWithMetadata) => cType
 )
 
 export { Store, ImmutableState, Action, getCTypes, getCType }
diff --git a/src/types/Ctype.ts b/src/types/Ctype.ts
index eed25204..f1899365 100644
--- a/src/types/Ctype.ts
+++ b/src/types/Ctype.ts
@@ -1,10 +1,12 @@
 import * as sdk from '@kiltprotocol/sdk-js'
 
-export interface ICType {
+export interface ICType extends sdk.ICTypeMetadata {
   cType: sdk.ICType
-  metaData: {
-    author: string
-  }
+}
+
+export interface ICTypeWithMetadata {
+  cType: sdk.ICType
+  metaData: sdk.ICTypeMetadata
 }
 
 export interface ICTypeInput {
@@ -13,8 +15,9 @@ export interface ICTypeInput {
   properties: object[] // TO DO: need to refine what properties are
   required: string[]
   title: string
-  description?: string
+  description: string
   type: string
+  owner: string | null
 }
 
 export interface IClaimInput {
@@ -25,20 +28,5 @@ export interface IClaimInput {
   title: string
   description?: string
   type: string
-}
-
-export class CType implements ICType {
-  public static fromObject(obj: ICType): CType {
-    const newCtype = Object.create(CType.prototype)
-    return Object.assign(newCtype, obj)
-  }
-
-  public metaData: {
-    author: string
-  }
-  public readonly cType: sdk.ICType
-
-  public getPropertyTitle(propertyName: string) {
-    return this.cType.metadata.properties[propertyName].title.default
-  }
+  owner?: string
 }
diff --git a/src/utils/CtypeUtils/CTypeUtlis.spec.ts b/src/utils/CtypeUtils/CTypeUtlis.spec.ts
index a79985c3..6c567d78 100644
--- a/src/utils/CtypeUtils/CTypeUtlis.spec.ts
+++ b/src/utils/CtypeUtils/CTypeUtlis.spec.ts
@@ -4,6 +4,7 @@ import {
   getCTypeInputModel,
 } from './CtypeUtils'
 import * as sdk from '@kiltprotocol/sdk-js'
+import { ICType, ICTypeInput } from 'src/types/Ctype'
 
 describe('CType', () => {
   const ctypeModel = {
@@ -16,18 +17,11 @@ describe('CType', () => {
       },
       type: 'object',
     },
-    metadata: {
-      title: { default: 'CType Title' },
-      description: {},
-      properties: {
-        'first-property': { title: { default: 'First Property' } },
-        'second-property': { title: { default: 'Second Property' } },
-      },
-    },
+    owner: '',
   } as sdk.ICType
 
   it('verify model transformations', () => {
-    const ctypeInput = {
+    const ctypeInput: ICTypeInput = {
       $id: 'http://example.com/ctype-1',
       $schema: 'http://kilt-protocol.org/draft-01/ctype-input#',
       properties: [
@@ -44,6 +38,8 @@ describe('CType', () => {
       ],
       type: 'object',
       title: 'CType Title',
+      description: '',
+      owner: '',
       required: ['first-property', 'second-property'],
     }
 
@@ -56,23 +52,32 @@ describe('CType', () => {
       },
       type: 'object',
       title: 'CType Title',
+      description: '',
       required: ['first-property', 'second-property'],
     }
-    const goodClaim = {
-      'first-property': 10,
-      'second-property': '12',
+    const goodClaim: sdk.IClaim = {
+      owner: '',
+      contents: {
+        'first-property': 10,
+        'second-property': '12',
+      },
+      cTypeHash: '',
     }
     const badClaim = {
-      'first-property': '1',
-      'second-property': '12',
-      'third-property': true,
+      owner: '',
+      contents: {
+        'first-property': 10,
+        'second-property': 12,
+        'third-property': true,
+      },
+      cTypeHash: '',
     }
-
     const ctypeFromInput = fromInputModel(ctypeInput)
     const ctypeFromModel = sdk.CType.fromCType(ctypeModel)
-    expect(JSON.stringify(ctypeFromInput)).toEqual(
+    expect(JSON.stringify(ctypeFromInput.cType)).toEqual(
       JSON.stringify(ctypeFromModel)
     )
+
     expect(JSON.stringify(getClaimInputModel(ctypeFromInput, 'en'))).toEqual(
       JSON.stringify(claimInput)
     )
@@ -80,12 +85,16 @@ describe('CType', () => {
       JSON.stringify(ctypeInput)
     )
 
-    expect(ctypeFromInput.verifyClaimStructure(goodClaim)).toBeTruthy()
-    expect(ctypeFromInput.verifyClaimStructure(badClaim)).toBeFalsy()
+    expect(
+      sdk.CType.fromCType(ctypeFromInput.cType).verifyClaimStructure(goodClaim)
+    ).toBeTruthy()
+    expect(
+      sdk.CType.fromCType(ctypeFromInput.cType).verifyClaimStructure(badClaim)
+    ).toBeFalsy()
 
     expect(() => {
       // @ts-ignore
-      new CType(goodClaim).verifyClaimStructure(goodClaim)
+      sdk.CType.fromCType(goodClaim)
     }).toThrow(new Error('CType does not correspond to schema'))
     expect(() => {
       ctypeInput.$schema = 'object'
diff --git a/src/utils/CtypeUtils/CtypeUtils.ts b/src/utils/CtypeUtils/CtypeUtils.ts
index c63b77f1..ed49e019 100644
--- a/src/utils/CtypeUtils/CtypeUtils.ts
+++ b/src/utils/CtypeUtils/CtypeUtils.ts
@@ -1,7 +1,11 @@
 import * as sdk from '@kiltprotocol/sdk-js'
 
-import { ICTypeInput, IClaimInput } from '../../types/Ctype'
-
+import {
+  ICTypeInput,
+  IClaimInput,
+  ICTypeWithMetadata,
+  ICType,
+} from '../../types/Ctype'
 /**
  * Create the CTYPE model from a CTYPE input model (used in CTYPE editing components).
  * This is necessary because component editors rely on editing arrays of properties instead of
@@ -11,44 +15,69 @@ import { ICTypeInput, IClaimInput } from '../../types/Ctype'
  * @returns The CTYPE for the input model.
  */
 
-export const fromInputModel = (ctypeInput: ICTypeInput, creator?: sdk.Identity["address"]): sdk.CType => {
+export const fromInputModel = (ctypeInput: ICTypeInput): ICTypeWithMetadata => {
   if (!sdk.CTypeUtils.verifySchema(ctypeInput, sdk.CTypeInputModel)) {
     throw new Error('CType input does not correspond to input model schema')
   }
-  const cTypeOwner = !creator ? null : creator
-  const ctype = {
-    schema: {
-      $id: ctypeInput.$id,
-      $schema: sdk.CTypeModel.properties.$schema.default,
-      properties: {},
-      type: 'object',
+  const schema: sdk.ICType['schema'] = {
+    $id: ctypeInput.$id,
+    $schema: sdk.CTypeModel.properties.$schema.default,
+    properties: {},
+    type: 'object',
+  }
+
+  const sdkMetadata: sdk.ICTypeMetadata['metadata'] = {
+    title: {
+      default: ctypeInput.title,
     },
-    metadata: {
-      title: {
-        default: ctypeInput.title,
-      },
-      description: {
-        default: ctypeInput.description,
-      },
-      properties: {},
+    description: {
+      default: ctypeInput.description,
     },
-    owner: cTypeOwner,
+    properties: {},
   }
 
   const properties = {}
   ctypeInput.properties.forEach((p: any) => {
-    const { title, $id, ...rest } = p
+    const { title, $id, description, ...rest } = p
     properties[$id] = rest
-    ctype.metadata.properties[$id] = {
+    sdkMetadata.properties[$id] = {
       title: {
         default: title,
       },
+      description: {
+        default: description,
+      },
     }
   })
-  ctype.schema.properties = properties
-  return sdk.CType.fromCType(ctype as sdk.ICType)
-}
+  schema.properties = properties
+
+  const ctype: sdk.ICType = {
+    schema,
+    owner: ctypeInput.owner,
+    hash: sdk.CTypeUtils.getHashForSchema(schema),
+  }
+  const sdkCTypeMetadata: sdk.ICTypeMetadata = {
+    metadata: sdkMetadata,
+    ctypeHash: ctype.hash,
+  }
 
+  const sdkCType = sdk.CType.fromCType(ctype)
+  return { cType: sdkCType, metaData: sdkCTypeMetadata }
+}
+/**
+ * This method returns the default title of the given property of the supplied CType
+ * @param propertyName the property for which to get the title for
+ * @param cType CType containing the property
+ * @returns {string} default title of the supplied property
+ */
+export const getCtypePropertyTitle = (
+  propertyName: string,
+  cType: ICType
+): string => {
+  const metadataDefaultTitle =
+    cType.metadata.properties[propertyName].title.default
+  return metadataDefaultTitle || propertyName
+}
 export const getLocalized = (o: any, lang?: string): string => {
   if (lang == null || !o[lang]) {
     return o.default
@@ -64,23 +93,26 @@ export const getLocalized = (o: any, lang?: string): string => {
  * @returns The CTYPE input model.
  */
 
-export const getCTypeInputModel = (ctype: sdk.CType): ICTypeInput => {
+export const getCTypeInputModel = (ctype: ICTypeWithMetadata): ICTypeInput => {
   // create clone
-  const result = JSON.parse(JSON.stringify(ctype.schema))
+  const result = JSON.parse(JSON.stringify(ctype.cType.schema))
   result.$schema = sdk.CTypeInputModel.$id
-  result.title = getLocalized(ctype.metadata.title)
-  result.description = getLocalized(ctype.metadata.description)
+  result.title = getLocalized(ctype.metaData.metadata.title)
+  result.description = getLocalized(ctype.metaData.metadata.description)
+  result.owner = ctype.cType.owner
   result.required = []
   result.properties = []
 
-  Object.entries(ctype.schema.properties as object).forEach(([key, value]) => {
-    result.properties.push({
-      title: getLocalized(ctype.metadata.properties[key].title),
-      $id: key,
-      type: value.type,
-    })
-    result.required.push(key)
-  })
+  Object.entries(ctype.cType.schema.properties as object).forEach(
+    ([key, value]) => {
+      result.properties.push({
+        title: getLocalized(ctype.metaData.metadata.properties[key].title),
+        $id: key,
+        type: value.type,
+      })
+      result.required.push(key)
+    }
+  )
 
   return result
 }
@@ -92,15 +124,15 @@ export const getCTypeInputModel = (ctype: sdk.CType): ICTypeInput => {
  * @returns {any} The claim input model
  */
 export const getClaimInputModel = (
-  ctype: sdk.ICType,
+  ctype: ICTypeWithMetadata,
   lang?: string
 ): IClaimInput => {
   // create clone
-  const result = JSON.parse(JSON.stringify(ctype.schema))
-  result.title = getLocalized(ctype.metadata.title, lang)
-  result.description = getLocalized(ctype.metadata.description, lang)
+  const result = JSON.parse(JSON.stringify(ctype.cType.schema))
+  result.title = getLocalized(ctype.metaData.metadata.title, lang)
+  result.description = getLocalized(ctype.metaData.metadata.description, lang)
   result.required = []
-  Object.entries(ctype.metadata.properties as object).forEach(
+  Object.entries(ctype.metaData.metadata.properties as object).forEach(
     ([key, value]) => {
       result.properties[key].title = getLocalized(value.title, lang)
       result.required.push(key)
diff --git a/yarn.lock b/yarn.lock
index 3ec1b246..75e83d0d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -241,9 +241,9 @@
   resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.2.tgz#63985d3d8b02530e0869962f4da09142ee8e200e"
 
 "@kiltprotocol/sdk-js@^0.x":
-  version "0.16.2"
-  resolved "https://registry.yarnpkg.com/@kiltprotocol/sdk-js/-/sdk-js-0.16.2.tgz#6d5340dff756ee7e3532a625092a6db011fcd337"
-  integrity sha512-qpvarAuW25CBymjYekvW5zvud5jUp0kC8CnaHJ5tPI5VN4X0hIJWIWBKS0IEv4CvgHtJNTO3SIQlVqwXxIpwNg==
+  version "0.17.0"
+  resolved "https://registry.yarnpkg.com/@kiltprotocol/sdk-js/-/sdk-js-0.17.0.tgz#9af16539859219c988aaa69e3642d7cdb94537fe"
+  integrity sha512-O+imN6Z2h854iD891EaJO276oVDWVvZzrC+keOB1YByZYplyyk7etVv+Ekr2PAsWGAtVCKI6as2QX4m0BLLwFQ==
   dependencies:
     "@polkadot/api" "^0.96.1"
     "@polkadot/keyring" "^1.7.0-beta.5"
@@ -254,7 +254,6 @@
     ajv "^6.6.1"
     bn.js "^4.11.8"
     jsonabc "^2.3.1"
-    lodash "^4.17.11"
     typescript-logging "^0.6.3"
     uuid "^3.3.2"