Restructure The Capture Map