Update to handle required option