Extension modules system added [EXPERIMENTAL]