Issue #8 port to Slick 2.0