Minor changes on interface