FIXED: Generic view controllers updated with legacy classes