Improvements for extendable modules code