Added modularity