Changed logic to not using properties and customizations