Added components structure and AMD support