Implemented modularization