No need to use openstruct + small fixes