Work on new resource encapsulation