Interface improvements

More dynamic and refactoring