Feature/fix exports