Cleaned up the code and removed object mapping from the root element, rather search for the element and work from there