Add support for UIUC