start adding db support