Updated to include eclipse-specific shit