Make @Listen the standard