Fixed issues with framework imports