Reverted back to non mongodb