Removed two content related classes, squashed into one, simpler
Added the new blob class