#64 Some minor optimizations, revert modifications from REST service, added NavigationObject element