This should also make it possible to remove the ```@SuppressWarnings("deprecation")```