Add container commandline arguments

Ready for merging
-