Feature/104 modify exports