Content addition and refactoring