Added facade and service provider