Allow custom container to be specified

Try to maintain performance as much as possible.