More modularized