Added some helper framework classes