Moved listeners into config