Fixing public headers on the framework
Making the schemes public