Various improvements including new resource structure.