More progress on plugin structure