More work on TTModularAPI