Container is now optional