Added lifetime fix files