OASIS 1.0.0.252

FIX - Various fixes with db operations