Adapted for new register functions support (ESP_reg in register