Added find and get functions