Removed custom Optional