Updated for no mongo format