Enhanced modules table organization