Attempt to remove hard dependency on OC

Let's try some @Optional