Removed static dispatch