Moved listeners to an external class