Hacks to get this working for my CAS POC