Refactoring
Fixed bug for interface