Update Logic Factory code, update Obj usage