Added some framework