Add MultiPoint support and bug fixing