We'll just convert this to a plugin hook