Updated for 1.9
Added more dependencies