Small changes to interface