Fix for #3 Add Overwrite routing