Added skeleton container.
Move path resolution into a container