Added more features to base classes