Move these into core in some form or another