Java Back-End changes for Autumn 2014 quarter