Add new fields
Final fixes (spec. authorization)