Convert to Services framework