Move to whitelist only for class creation