supports more fields
fix scoping of readonly management