Some changes to the interface