Added some framework stuff