Collapsed job and mcsystem types into a single job entity