Refactor/extend introduction