Minor changes on the interface