adding changes for framework integration