Minor changes
Added inf-mongo plus some minor changes