Remade class to sate IntelliJ