Updated to xtend for full object extending