Updates to use new system property replacement when loading json