Some setup improvement