Reverted to base classes