[UPDATE] Refactor controller return type