Changes because we use now MongoDB