Added dataSuffix system property