Updated to match entity bean column names, and new db location