Updated Java-model to match DB.