Updated object defs