Added initial modularized configuration