Add lock and aging mechanism