Incorporating Concepts from History Education and Civic Education