Add a base class for wrappers
Remove common methods from classes