Remove duplicate _uc function (also in common.py).
Remove _option from functions parameters. Differentiate persons-specific entities.