Refactore edit subscription