Tidied how extras class is handled