Change attribute loading by module to optional