Made better use of SQLA's event model