added cluster support and custom expression evaluation