Added in more framework-related files