Action listeners changes

Replaces #91