Revamped row creation for modularity