Rework property file inclusion