total refactoring of database-related code, actors refactoring are on the que