Add fields + rights check