map expiration improvements cont. use predefine now.