Some changes to interface