Changes for supporting Docent