Merge jvskelton/jugglingdb attribute changes