Updated framework to improve issues with the linker.