Reverted back to embedded DB for time being :\