Documentataion enhanced