Add registry support