more changes towards the new object hierarchy