Added some framework elements