Added some framework code