Added typesaftey