Added more complex model, data annotations