Yeah, I thought about that over the weekend - I essentially just ported the code that was previously in SimpleModule.