Added “empty” and “container” options.