Resolved issue with store of attachnodes being a reference instead of a clone
All remaining changes