First part of PUT fix. Still missing array modification