#80 refactoring Handle: refactoring export list