Added find capability