Improved AbstractCriteria
Cleanup