Extra listener classes added