Added some composite classes