Bumped java version and abstracted out map stores.