Added tomcat as service optional