Updated module imports for 0.8
Added find