Add repository extra settings model
Minor corrections
Don't forget includes