Use ${..} instead of deprecated