Move factory attributes that need expansion from global to entry
Add attribute expansion to factory as well