Added some framework classes