Updated to new CFRP Standard

Removed blocking
Added thread killing to choice
Changed resource data to be more transactional to facilitate thread
killing