More framework code