Update encapsulation for sanity