Moved WHERE condition to a custom method so it can be extended
CS