Added content mapping (still needs some cleanup).