Updated doc & fix in services