Code design and Scope Interface fixed
Interfaces changes