Progress on plugin structure