Restructing the object a bit