Added expiration and container options