Updated to work with new layout; privatized module specific members