diff -r eb48f716b31c -r e10457d74fe1 src/server/util/object.c
--- a/src/server/util/object.c	Mon Feb 10 17:44:51 2025 +0100
+++ b/src/server/util/object.c	Sun Mar 02 18:10:52 2025 +0100
@@ -115,7 +115,7 @@
 Expression* condition_create(pool_handle_t *pool, CxList *tokens) {
     size_t pos = 0;
     NSAPIExpression *expression = expr_parse_logical_expr(pool, tokens, &pos);
-    if(!expression || pos != tokens->size) {
+    if(!expression || pos != cxListSize(tokens)) {
         return NULL;
     }
     
@@ -271,11 +271,11 @@
 
 NSAPIExpression* expr_parser_pop(ExprParser *parser) {
     CxList *stack = parser->ex_stack;
-    if(stack->size == 0) {
+    if(cxListSize(stack)== 0) {
         return NULL;
     }
-    NSAPIExpression *ret = *((NSAPIExpression**)cxListAt(stack, stack->size-1));
-    cxListRemove(stack, stack->size-1);
+    NSAPIExpression *ret = *((NSAPIExpression**)cxListAt(stack, cxListSize(stack)-1));
+    cxListRemove(stack, cxListSize(stack)-1);
     return ret;
 }
 
@@ -339,11 +339,11 @@
     exp->right = NULL;
     exp->value.str = func->identifier;
     
-    if(parser->ex_stack->size > 0) {
-        NSAPIExpression *top = *((NSAPIExpression**)cxListAt(parser->ex_stack, parser->ex_stack->size - 1));
+    if(cxListSize(parser->ex_stack) > 0) {
+        NSAPIExpression *top = *((NSAPIExpression**)cxListAt(parser->ex_stack, cxListSize(parser->ex_stack) - 1));
         if(top && top->operator == NSAPI_EXPRESSION_ARG) {
             exp->left = top;
-            cxListRemove(parser->ex_stack, parser->ex_stack->size - 1);
+            cxListRemove(parser->ex_stack, cxListSize(parser->ex_stack) - 1);
         }
     }
     
@@ -418,8 +418,8 @@
             new_op.identifier = (cxstring){NULL,0};
             new_op.expect_value = parser->expect_value;
             new_op.open_parenthesis = FALSE;
-            while(op_stack->size > 0) {
-                ExprOpStackItem *stack_item = cxListAt(op_stack, op_stack->size-1);
+            while(cxListSize(op_stack) > 0) {
+                ExprOpStackItem *stack_item = cxListAt(op_stack, cxListSize(op_stack)-1);
                 if(stack_item->operator == NSAPI_EXPRESSION_NOOP) {
                     break;
                 }
@@ -430,15 +430,15 @@
                 if(expr_add_operator(parser, stack_item)) {
                     return NULL;
                 }
-                cxListRemove(op_stack, op_stack->size-1);
+                cxListRemove(op_stack, cxListSize(op_stack)-1);
             }
             cxListAdd(op_stack, &new_op);
             parser->expect_value = TRUE;
             parser->expect_arg = FALSE;
         } else if(token.length == 1 && token.ptr[0] == '(') {
             ExprOpStackItem *prev_op = NULL;
-            if(op_stack->size > 0) {
-                prev_op = cxListAt(op_stack, op_stack->size - 1);
+            if(cxListSize(op_stack) > 0) {
+                prev_op = cxListAt(op_stack, cxListSize(op_stack) - 1);
             }
             
             if(prev_op && prev_op->operator == NSAPI_EXPRESSION_CALL) {
@@ -459,10 +459,10 @@
         } else if(token.length == 1 && token.ptr[0] == ')') {
             int found_open_bracket = FALSE;
             ExprOpStackItem stack_item;
-            while(op_stack->size > 0) {
-                ExprOpStackItem *stack_item_ptr = cxListAt(op_stack, op_stack->size-1);
+            while(cxListSize(op_stack) > 0) {
+                ExprOpStackItem *stack_item_ptr = cxListAt(op_stack, cxListSize(op_stack)-1);
                 stack_item = *stack_item_ptr;
-                cxListRemove(op_stack, op_stack->size-1);
+                cxListRemove(op_stack, cxListSize(op_stack)-1);
                 if(stack_item.open_parenthesis) {
                     found_open_bracket = TRUE;
                     break;
@@ -498,18 +498,18 @@
         }
     }
     
-    while(op_stack->size > 0) {
-        ExprOpStackItem *stack_item = cxListAt(op_stack, op_stack->size-1);
+    while(cxListSize(op_stack) > 0) {
+        ExprOpStackItem *stack_item = cxListAt(op_stack, cxListSize(op_stack)-1);
         if(stack_item->open_parenthesis) {
             return NULL;
         }
         if(expr_add_operator(parser, stack_item)) {
             return NULL;
         }
-        cxListRemove(op_stack, op_stack->size-1);
+        cxListRemove(op_stack, cxListSize(op_stack)-1);
     }
     
-    if(ex_stack->size != 1) {
+    if(cxListSize(ex_stack) != 1) {
         return NULL;
     }
     
@@ -531,8 +531,8 @@
     parser.expect_arg = FALSE;
     
     NSAPIExpression *ret = expr_parse_expr(&parser);
-    cxListDestroy(op_stack);
-    cxListDestroy(ex_stack);
+    cxListFree(op_stack);
+    cxListFree(ex_stack);
     
     return ret;
 }