Updated to have no mongo deps