added find and modify support.