Add option 'container' to support other containers than default window