Adding registry functionality