moved to attributes map instead of fields