Clean code
Add TODO for authorization attributes