Yeah, I'd like to rework this functionality with ExpressionLanguage.