Feature/code declared roles