Use new listener to handle default entities