Updated pinned/unpinned handling