Update Registry class, docblocks and remove static from $data