Preparing to change load order
Added properties to select demo environment