+ cleaned up resource tracking
+ support new resource tracking api
+ timer api