FEATURE - ISSUE:1,2 - tgalazka - Made sure it still worked on node 0.10; added object mapping.