Update for framework 3.2 compatibility