Updated to simplify Plugin development
for modules.