add restricted fields
update service
fix tests
update