Content extraction and addition

Minor changes