Updated dto's and ConvertEntities