Converting to OpenStruct

ENV support is still missing