Made some Changes for eclipse