Removed Compat dependency, changed to `@d()` and `c()`