Fix import bug. Add missing dependencies