Enable YAML files with .yml extension
Optimize addremove procedures