SOC-4444 | Implement expand field