Changed immutability of Options class