Object and AdditionalData refactoring

Improves Perf as well