Added WAR support