Change some parts for eclipse