Further updates to make the source code more Eclipse friendly