Updated for eclipse-luna