Add basic framework changes (boilerplate stuff)