refactoring of list -> map in optional header. get method added