#456 Added known listeners