[IMP] Improved documentation