Restored the support modules