Update for define_view branch

This should keep the accessaries working with define_view PR.