Updated views in line with the latest entity framework stuff