adapt to new API based on toplevel objects w/ public & private members