Implement static class dispatch
Fix static dispatch