Support metadata and metaclasses
Fix PR merge
Fix tests and build
Removed the escape chars from the . when using the StringUtils replace method.