Updating Sample project with the changes in the framework