working on db support