Updated for OSBL changes