Updated for revised objects