Addressing is now in a separate class