Some changes on interface