Basic support for Javadoc modules
Refactor Match to reduce hard-coded constants