Hardcoded empty snippets need to be updated as well..