Made functions on Object more consistent