Small optimization + notification back-end