Framework integration, take 2