Add a bunch of stuff for apm