Added ClassNN support