Add static refs and class stubs