Add new javadoc comments and delete DefaultContext class