WIP - Upgrade to Slick 2