Made Eclipse Compatible