Added missing override and final specifiers