Add custom_expand