Removing optional tag for now