@pjedrzejewski Removed that dependency & and added those `supports()` methods.