Add new implementation to consider DB instance