Stuff that isn't in the core (yet)