fix it
extract data to domain object for post/put