Add base classes to solution