Fix interface problems and use statements

Fix interface problems and use statements

Fix interface problems and use statements