Modularizing and enhancing