Add update option
Make everything public