refactored exporting entry level elements