BLK-33 Updates dynamic fields block to use expression property

Signed-off-by: Oren Leiman <oren@neutral.io>