Make Mock interface generic

And fill out the rest of the global interfaces