Added expand to find()