Add proper invoke support and cleanup our usage