Introduced a bit of modularity