Removing unused code. Make 2 listeners having optional params  - as application can use "current" ones (Application keeps current state of some data)
Added method for showing error messages.