Added .pch file and consolidated overriding