Merge proper db call changes into master