Add weights handling (experimental)