Updated framework with boilerplate template