Check in refactoring fixes for storing java as list