Updated framework with offline preview support