Added modularity check