Updating the code to remove the need for Editor specifics