Storing objects, not pointers.

More comfortable for next commit
One entry point access