Feature/amd wrapped code