Abstracted the extension lifetime class. Minor naming changes.