Updated for the latest CommonLib changes