changes to facade and serviceprovider