Add class argument support for identity