Updated to remove Eclipse warnings