Refactor continuous changes mode