Updated to use FrameworkSource