Registry support