Re-added model type class