Joint editor work, updates to lazy loaded properties to use promise objects