Remove TODO : use real type on item creation