Changed object ownership design