Refactored core concepts.