Changed some more facades to point to base class instead of implementation