Updated for newer Slick version