Added find by mask and contents