Updated amd/non-amd stuff and plugin instantiation