Refactor + Fix: prevent saving new table before creating