Fix for No DB Use Case