Multipartentity support

I updated the support library in here as well but forgot to add a commit message on that.