Some clean up
Add event notification methods