Refactored slick package