Added addresses to models
Added ability to return addresses in api