Fix naming issue & add set/get object