Use simpler module system