Use new Container Infrastructure

Fixes #19
Fix umask semantic

Closes #44