Use the new base class
Add more debug info