Added new Base skeletons for DI integration