Add save updated event and improve acess controls