Refactored content and engine