Updates database controllers to fix callback timing bug