Working on Plugin arch again