Adjusted class support & added scoreboards