OK, more is located there now. Too bad we have to duplicate in Lambda.