Refactored some of the bindings to use the update function instead of relying on adding notifications in the init