Debugging, small fixes and refactoring of update
Refactoring, Add Schema (Please, don't use flush_schema)