Most of the stuff is stored locally now, label expansion work properly