Updated to support Eclipse and IDEA