Updated express implementation