Add stuff needed by the current stable implementation