Add User and Address to data model (Fixes #1)