Small changes on interface.