Add overrides for analyze mode