[REFACTORING] database + options (client-side) updated