Enhanced module system