Add classes back to WAR #135 #136