Change base class as  current is deprecrated