Fix some annotation issues

and Help complement with Controller extraction parameters