Updated to support CoralUI