Added basic listener support