Routemap: modify demo and option-db, refactoring