Database model refactoring - all models should inherit from CoreModel
Changes in storage threads and token model