Re-worked how documentation is handled