enhance find method