Update class and maven setup.