Fixed javadoc and usage of context objects