Changes to support eclipse lunes.