Added changes to higher level structures required by new normal calculation algorithm