Make move listeners optional