Persist changes using API - #7, #8, #9, #12