Added address generation to register