Fork of Client Registry Toolkit