#89 refactoring State: refactoring export list