Property files are now done better