Added more framework code
Added more framework code