Changed Context to Java Map