Converted to Eclipse plugin project (part 3)