Refactored sql statement count to using a validator instead of an aspect