Specify original object

This should be handled using the pojo objects (breaking change).
To be replaced on develop.