Converted to make_shared creation of shared_ptrs. Added WorkTypes definitions.