Updated DB functions to work with J3.0