Simplify controller interface to authorities.

Tried to change as many as possible. Still WIP.