#471 Metadata Massive Replace. Remove inner class to avoid Findbugs issue