Decouple database reliance