Going to add a preprocessor symbol for Expression vs dynamic