Added repair service
Removed strange comment
Added tree-like structure into avs