changed detour to be more independent from architecture
Added exports