Import org.apache.catalina, change match from perfect to equivalent