Fix documentation
Fix backwards compatibility