create update to handler map more clearly