expanded types model

fixed the changes I broke on the types model
put/post now working ok