Upgrade to Slick 2