Added base class, facades, service provider