Add callbacks, rename callback method names
Fixed getListener