Improve UCAT performance