Added previously deleted classes