Add ImprovedNamingStrategy