Updated to support 5.6 CoralUI