Improvements on interface