Make modular using manual AMD for now