Added structure-management module