Entity model redesigned to separate users from customer accounts