Debugging, migrations to new interfaces
Migrate logical to use new interfaces