Refactor zoom dependencies