Fixed import issues with db