Replaced values by options
Added rough missing values handling

Missing values are represented using Option.