Added db support
merged