Update the initialization and compare methods