Added data model and test service.