Starting to address dependency issues and content injection