Make API more stable