Adjusted databases to use auto generated views