Made changes to add framework 1.3.3.1 support