Properties are now loaded in a more robust way