Finish implementing basic service providers