Added option to use custom values instead of replacing