Change API for save