Add future documentation

Merging for compatibility