Add support for both part instance and assembly sets and more element types