Added register() and remove() to Database
Added saving