Add improved OOO structure box boundaries