MAJOR CHANGE: MVEL expressions added