Further adopt to base class