Restored 'Generic' to namespace