Fix
Add install and uninstall observers