Change database helpers design