Changed interface a bit for get/set