oflib changes for Optical Support