Improved Maybe: changed class on struct.