Minor changes to interface