Main module now references the correct objects