Added some future classes