Minor fix
Space target dir bug on Generation fixed
Import java.util.List condition added