Added both original and current configurations