Changed structure for AMX