Fix needed after removing addresses class