follow all deepjs refactoring