Modifying the documentation and storage layers