Refactored slick stuff