Some work on plugin structure