Updated after Future api changes