Changed to use Base class