Proposal for #309

Proposal for the #309 issue with administration area