Simplified query
Added findAll